Don't use g_slist_next in the x11 backend
authorMatthias Clasen <mclasen@redhat.com>
Tue, 20 Oct 2015 00:31:57 +0000 (20:31 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 20 Oct 2015 10:14:57 +0000 (06:14 -0400)
We generally use ->next directly.

gdk/x11/gdkcursor-x11.c
gdk/x11/gdkdevice-core-x11.c
gdk/x11/gdkdevice-xi2.c
gdk/x11/gdkwindow-x11.c

index 540f48ef7d8fab76696df7b78345fca2788afff4..d7388f1186d7c14edb8a4b570bbab104dafce7a3 100644 (file)
@@ -155,13 +155,13 @@ _gdk_x11_cursor_display_finalize (GdkDisplay *display)
           /* Remove this item from the list */
           *(itemp) = item->next;
           olditem = item;
-          item = g_slist_next (item);
+          item = item->next;
           g_slist_free_1 (olditem);
-        } 
-      else 
+        }
+      else
         {
           itemp = &(item->next);
-          item = g_slist_next (item);
+          item = item->next;
         }
     }
 }
index 2c1fb5648f26a596be8418f6b3b5292dfbf07f8a..1c10a13954049e51df35c652ce9bb35d9a227c5c 100644 (file)
@@ -474,7 +474,7 @@ gdk_x11_device_core_window_at_position (GdkDevice       *device,
       pointer_window = None;
       screen = gdk_display_get_screen (display, 0);
       toplevels = gdk_screen_get_toplevel_windows (screen);
-      for (list = toplevels; list != NULL; list = g_list_next (list))
+      for (list = toplevels; list != NULL; list = list->next)
         {
           window = GDK_WINDOW (list->data);
           impl = GDK_WINDOW_IMPL_X11 (window->impl);
index 515840b83a21cfd34245699a1a7d1e030934f280..a77002e7000ce86bea645124482e2cf16f7dce81 100644 (file)
@@ -544,7 +544,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice       *device,
 
       screen = gdk_display_get_screen (display, 0);
       toplevels = gdk_screen_get_toplevel_windows (screen);
-      for (list = toplevels; list != NULL; list = g_list_next (list))
+      for (list = toplevels; list != NULL; list = list->next)
         {
           window = GDK_WINDOW (list->data);
           xwindow = GDK_WINDOW_XID (window);
index 2ae8105d7d76afd48ccf5b78a4258b50e6f4d585..3baa1a1f80737d141d60acf9452022838b5b7c98 100644 (file)
@@ -3864,7 +3864,7 @@ gdk_x11_window_set_icon_list (GdkWindow *window,
       n++;
       size += 2 + width * height;
       
-      l = g_list_next (l);
+      l = l->next;
     }
 
   data = g_malloc (size * sizeof (gulong));
@@ -3903,7 +3903,7 @@ gdk_x11_window_set_icon_list (GdkWindow *window,
            }
        }
 
-      l = g_list_next (l);
+      l = l->next;
       n--;
     }